Release 2022.5

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index dd7ed8df7e66b9873bbcc48b487ae9291db85d2b..f93f712aa1c542f1abcc832af6b7be512dc5afbb 100644 (file)
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -174,9 +174,6 @@ symbol_files = $(top_srcdir)/src/libostree/libostree-released.sym
 #if BUILDOPT_IS_DEVEL_BUILD
 #symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
 #endif
-if BUILDOPT_IS_DEVEL_BUILD
-symbol_files += $(top_srcdir)/src/libostree/libostree-devel.sym
-endif
 
 # http://blog.jgc.org/2007/06/escaping-comma-and-space-in-gnu-make.html
 wl_versionscript_arg = -Wl,--version-script=

diff --git a/configure.ac b/configure.ac
index 445c53e0f07cd7b81af75d20d76d98148f23c5ed..964df128d9c71ef56fab5ac06effb176a04e0080 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ m4_define([year_version], [2022])
 m4_define([release_version], [5])
 m4_define([package_version], [year_version.release_version])
 AC_INIT([libostree], [package_version], [walters@verbum.org])
-is_release_build=no
+is_release_build=yes
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([buildutil])
 AC_CONFIG_AUX_DIR([build-aux])

diff --git a/src/libostree/libostree-devel.sym b/src/libostree/libostree-devel.sym
index 145ec1ec5fd52242fd0f43620d758b44b1f92a41..eef5cba0b79ce805d9e9e4810ff7dc6f649c9ab9 100644 (file)
--- a/src/libostree/libostree-devel.sym
+++ b/src/libostree/libostree-devel.sym
@@ -20,11 +20,6 @@
    - uncomment the include in Makefile-libostree.am
 */
 
-LIBOSTREE_2022.5 {
-global:
-  ostree_kernel_args_append_if_missing;
-  ostree_sysroot_deployment_set_kargs_in_place;
-} LIBOSTREE_2022.4;
 
 /* Stub section for the stable release *after* this development one; don't
  * edit this other than to update the year.  This is just a copy/paste

diff --git a/src/libostree/libostree-released.sym b/src/libostree/libostree-released.sym
index 5afdfd3e223523f5d8f14f58867fd7750d104161..a5b9bdda72ca1c605b9a7c0e01c4c6bbb17e0bee 100644 (file)
--- a/src/libostree/libostree-released.sym
+++ b/src/libostree/libostree-released.sym
@@ -683,6 +683,12 @@ global:
   ostree_fs_get_all_xattrs_at;
 } LIBOSTREE_2022.2;
 
+LIBOSTREE_2022.5 {
+global:
+  ostree_kernel_args_append_if_missing;
+  ostree_sysroot_deployment_set_kargs_in_place;
+} LIBOSTREE_2022.4;
+
 /* NOTE: Only add more content here in release commits!  See the
  * comments at the top of this file.
  */

diff --git a/tests/test-symbols.sh b/tests/test-symbols.sh
index a14849d56e77780bd42d767e3f171af1df1b456d..6eeb73ae8025c59c72745f5755750fa108b2be63 100755 (executable)
--- a/tests/test-symbols.sh
+++ b/tests/test-symbols.sh
@@ -54,7 +54,7 @@ echo 'ok documented symbols'
 
 # ONLY update this checksum in release commits!
 cat > released-sha256.txt <<EOF
-34ff6c97e20242a449b210f7452a12d0bb6ac9e135638f71c2d27b2f2b583ef3  ${released_syms}
+370e560e4044b17523d23b04e383539cd22eac7c3067b7324803129ceebd73f0  ${released_syms}
 EOF
 sha256sum -c released-sha256.txt